From 9f33fcb4bd9d830f042eef6db99540a373cfb060 Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Tue, 2 May 2006 17:17:15 +0100 Subject: [PATCH] Remove i386/x8664 differences in vmx reg store/load routines. Signed-off-by: Keir Fraser --- xen/arch/x86/hvm/vmx/vmx.c | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 86e3d9c763..6e7a40ab9c 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -452,17 +452,6 @@ static void vmx_store_cpu_guest_regs( if ( regs != NULL ) { -#if defined (__x86_64__) - __vmread(GUEST_RFLAGS, ®s->rflags); - __vmread(GUEST_SS_SELECTOR, ®s->ss); - __vmread(GUEST_CS_SELECTOR, ®s->cs); - __vmread(GUEST_DS_SELECTOR, ®s->ds); - __vmread(GUEST_ES_SELECTOR, ®s->es); - __vmread(GUEST_GS_SELECTOR, ®s->gs); - __vmread(GUEST_FS_SELECTOR, ®s->fs); - __vmread(GUEST_RIP, ®s->rip); - __vmread(GUEST_RSP, ®s->rsp); -#elif defined (__i386__) __vmread(GUEST_RFLAGS, ®s->eflags); __vmread(GUEST_SS_SELECTOR, ®s->ss); __vmread(GUEST_CS_SELECTOR, ®s->cs); @@ -472,7 +461,6 @@ static void vmx_store_cpu_guest_regs( __vmread(GUEST_FS_SELECTOR, ®s->fs); __vmread(GUEST_RIP, ®s->eip); __vmread(GUEST_RSP, ®s->esp); -#endif } if ( crs != NULL ) @@ -510,23 +498,6 @@ void vmx_load_cpu_guest_regs(struct vcpu *v, struct cpu_user_regs *regs) ASSERT(v->arch.hvm_vmx.launch_cpu == smp_processor_id()); -#if defined (__x86_64__) - __vmwrite(GUEST_SS_SELECTOR, regs->ss); - __vmwrite(GUEST_DS_SELECTOR, regs->ds); - __vmwrite(GUEST_ES_SELECTOR, regs->es); - __vmwrite(GUEST_GS_SELECTOR, regs->gs); - __vmwrite(GUEST_FS_SELECTOR, regs->fs); - __vmwrite(GUEST_RSP, regs->rsp); - - __vmwrite(GUEST_RFLAGS, regs->rflags); - if (regs->rflags & EF_TF) - __vm_set_bit(EXCEPTION_BITMAP, EXCEPTION_BITMAP_DB); - else - __vm_clear_bit(EXCEPTION_BITMAP, EXCEPTION_BITMAP_DB); - - __vmwrite(GUEST_CS_SELECTOR, regs->cs); - __vmwrite(GUEST_RIP, regs->rip); -#elif defined (__i386__) __vmwrite(GUEST_SS_SELECTOR, regs->ss); __vmwrite(GUEST_DS_SELECTOR, regs->ds); __vmwrite(GUEST_ES_SELECTOR, regs->es); @@ -543,7 +514,6 @@ void vmx_load_cpu_guest_regs(struct vcpu *v, struct cpu_user_regs *regs) __vmwrite(GUEST_CS_SELECTOR, regs->cs); __vmwrite(GUEST_RIP, regs->eip); -#endif /* Reload current VCPU's VMCS if it was temporarily unloaded. */ if ( (v != current) && hvm_guest(current) ) -- 2.30.2